API: gtk_cell_renderer_render_cairo() => gtk_cell_renderer_render()

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index dcad47e544ae763e2c5460f082b06751658df1e2..486ff14552bc75f25a953d1406addc1ca1b816d1 100644 (file)
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -612,7 +612,7 @@ gtk_cell_renderer_get_size (GtkCellRenderer    *cell,
 }
 
 /**
- * gtk_cell_renderer_render_cairo:
+ * gtk_cell_renderer_render:
  * @cell: a #GtkCellRenderer
  * @cr: a cairo context to draw to
  * @widget: the widget owning @window
@@ -630,12 +630,12 @@ gtk_cell_renderer_get_size (GtkCellRenderer    *cell,
  * @window.
  **/
 void
-gtk_cell_renderer_render_cairo (GtkCellRenderer      *cell,
-                                cairo_t              *cr,
-                                GtkWidget            *widget,
-                                const GdkRectangle   *background_area,
-                                const GdkRectangle   *cell_area,
-                                GtkCellRendererState  flags)
+gtk_cell_renderer_render (GtkCellRenderer      *cell,
+                          cairo_t              *cr,
+                          GtkWidget            *widget,
+                          const GdkRectangle   *background_area,
+                          const GdkRectangle   *cell_area,
+                          GtkCellRendererState  flags)
 {
   gboolean selected = FALSE;
   GtkCellRendererPrivate *priv = cell->priv;

diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index fa356c105fe01a51939cf58c8e40405dfacebea0..29fda86044c8c0d1157a1c786f1698c7617ed6ff 100644 (file)
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -119,7 +119,7 @@ void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
                                                   gint                 *width,
                                                   gint                 *height);
 #endif
-void             gtk_cell_renderer_render_cairo   (GtkCellRenderer      *cell,
+void             gtk_cell_renderer_render         (GtkCellRenderer      *cell,
                                                    cairo_t              *cr,
                                                   GtkWidget            *widget,
                                                   const GdkRectangle   *background_area,

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 7a3a9e45a77bc87a11ab7acc6bcee59fd05a5261..4c0292a730fd47f48d4fc1049f4a26b320a54ab8 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -489,11 +489,11 @@ gtk_cell_view_draw (GtkWidget *widget,
              (packing == GTK_PACK_END && !rtl))
            area.x -= area.width;
 
-         gtk_cell_renderer_render_cairo (info->cell,
-                                          cr,
-                                          widget,
-                                          /* FIXME! */
-                                          &area, &area, state);
+         gtk_cell_renderer_render (info->cell,
+                                    cr,
+                                    widget,
+                                    /* FIXME! */
+                                    &area, &area, state);
 
          if ((packing == GTK_PACK_START && !rtl) ||
              (packing == GTK_PACK_END && rtl))

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 92821571f56e44d5eab370dc8a523389f0291f21..240dcd7ef3f3d9892e8169e2e2e29f88d5346087 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3239,10 +3239,10 @@ gtk_icon_view_paint_item (GtkIconView     *icon_view,
       cell_area.x = x - item->x + cell_area.x;
       cell_area.y = y - item->y + cell_area.y;
 
-      gtk_cell_renderer_render_cairo (info->cell,
-                                      cr,
-                                      widget,
-                                      &cell_area, &cell_area, flags);
+      gtk_cell_renderer_render (info->cell,
+                                cr,
+                                widget,
+                                &cell_area, &cell_area, flags);
     }
 
   if (draw_focus &&

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index a28c2a6ce3426951353e1f43ebd56ff301321d0c..9a14311e10ca663a13fd6dedab23efbfb19503d0 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2825,12 +2825,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn  *tree_column,
       /* RENDER */
       if (action == CELL_ACTION_RENDER)
        {
-         gtk_cell_renderer_render_cairo (info->cell,
-                                          cr,
-                                          tree_column->tree_view,
-                                          &rtl_background_area,
-                                          &rtl_cell_area,
-                                          flags);
+         gtk_cell_renderer_render (info->cell,
+                                    cr,
+                                    tree_column->tree_view,
+                                    &rtl_background_area,
+                                    &rtl_cell_area,
+                                    flags);
        }
       /* FOCUS */
       else if (action == CELL_ACTION_FOCUS)
@@ -2993,12 +2993,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn  *tree_column,
       /* RENDER */
       if (action == CELL_ACTION_RENDER)
        {
-         gtk_cell_renderer_render_cairo (info->cell,
-                                          cr,
-                                          tree_column->tree_view,
-                                          &rtl_background_area,
-                                          &rtl_cell_area,
-                                          flags);
+         gtk_cell_renderer_render (info->cell,
+                                    cr,
+                                    tree_column->tree_view,
+                                    &rtl_background_area,
+                                    &rtl_cell_area,
+                                    flags);
        }
       /* FOCUS */
       else if (action == CELL_ACTION_FOCUS)